From: Keir Fraser <keir.fraser@citrix.com>
Date: Sat, 24 Nov 2007 13:31:01 +0000 (+0000)
Subject: [Mini-OS] Permit x86_64 trap handlers to return
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14714
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=153bf118147546554a2cb774a637f94b89c36f56;p=xen.git

[Mini-OS] Permit x86_64 trap handlers to return

Trap handlers sometimes fix the problem, so they need to be able to
return.

Signed-off-by: Samuel Thibault <samuel.thibault@citrix.com>
---

diff --git a/extras/mini-os/arch/x86/x86_64.S b/extras/mini-os/arch/x86/x86_64.S
index 55b17da5f7..815dca36ad 100644
--- a/extras/mini-os/arch/x86/x86_64.S
+++ b/extras/mini-os/arch/x86/x86_64.S
@@ -193,6 +193,7 @@ error_call_handler:
 	movq ORIG_RAX(%rsp),%rsi	# get error code 
 	movq $-1,ORIG_RAX(%rsp)
 	call *%rax
+	jmp error_exit
 
 .macro zeroentry sym
 #	INTR_FRAME